From 8ad67c8e05b9dec349d8cc0a72acdb872f39dd0d Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 10 Feb 2011 14:14:24 +0000 Subject: [PATCH] ix86: re-do permanent disabling of x2apic Move logic into check_x2apic_preenabled() (to make sure generic_apic_probe() doesn't see genapic already set). Signed-off-by: Jan Beulich Signed-off-by: Keir Fraser --- xen/arch/x86/apic.c | 16 ---------------- xen/arch/x86/genapic/x2apic.c | 12 ++++++++++++ 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/xen/arch/x86/apic.c b/xen/arch/x86/apic.c index ceefc6784d..1590c3a171 100644 --- a/xen/arch/x86/apic.c +++ b/xen/arch/x86/apic.c @@ -961,22 +961,6 @@ void __init x2apic_bsp_setup(void) if ( !cpu_has_x2apic ) return; -#ifdef __i386__ - clear_bit(X86_FEATURE_X2APIC, boot_cpu_data.x86_capability); - if ( x2apic_enabled ) - { - uint64_t msr_content; - rdmsrl(MSR_IA32_APICBASE, msr_content); - msr_content &= ~(MSR_IA32_APICBASE_ENABLE | MSR_IA32_APICBASE_EXTD); - wrmsrl(MSR_IA32_APICBASE, msr_content); - msr_content |= MSR_IA32_APICBASE_ENABLE; - wrmsrl(MSR_IA32_APICBASE, msr_content); - x2apic_enabled = 0; - } - printk("x2APIC disabled permanently on x86_32.\n"); - return; -#endif - if ( !opt_x2apic ) { if ( !x2apic_enabled ) diff --git a/xen/arch/x86/genapic/x2apic.c b/xen/arch/x86/genapic/x2apic.c index 7cf8989947..acc6a026df 100644 --- a/xen/arch/x86/genapic/x2apic.c +++ b/xen/arch/x86/genapic/x2apic.c @@ -138,7 +138,19 @@ void __init check_x2apic_preenabled(void) if ( lo & MSR_IA32_APICBASE_EXTD ) { printk("x2APIC mode is already enabled by BIOS.\n"); +#ifndef __i386__ x2apic_enabled = 1; genapic = apic_x2apic_probe(); +#else + lo &= ~(MSR_IA32_APICBASE_ENABLE | MSR_IA32_APICBASE_EXTD); + wrmsr(MSR_IA32_APICBASE, lo, hi); + lo |= MSR_IA32_APICBASE_ENABLE; + wrmsr(MSR_IA32_APICBASE, lo, hi); + printk("x2APIC disabled permanently on x86_32.\n"); +#endif } + +#ifdef __i386__ + clear_bit(X86_FEATURE_X2APIC, boot_cpu_data.x86_capability); +#endif } -- 2.30.2